merge trunk
authorKenichi Handa <handa@gnu.org>
Sun, 16 Sep 2012 11:47:45 +0000 (20:47 +0900)
committerKenichi Handa <handa@gnu.org>
Sun, 16 Sep 2012 11:47:45 +0000 (20:47 +0900)
commit0fdabfe1a6ecfbfb106aca0e308c93b561ddebe7
tree9e64d7338b4c0c2038aa8da101a66180708aa430
parent67d63910b097d012a655427a822bf591c2a07d93
parenta4a31af5cf904662c6f03dde8baafe829186e6bb
merge trunk
src/ChangeLog
src/font.c